[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog...

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914 am: f3efcd70 am: ddb2bf09 am: 6ccb5f66 -s ours
am: a3edaf6b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4682e4edcb9997d1537af5adc4c490723f8f861