[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebc am: d7f9b193
am: 6c20cafa -s ours
am skip reason: subject contains skip directive

Change-Id: Ic13cb2ca31f5324e090f7d6d3de675f002a2724f