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