[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 999d4322 am: 1f76c7c3 skipped: 2f289cf2 am: ff7d514c
am: 3d3735ba

Change-Id: I04b90889c8186f3e21b73729e0e8f8cd1b6b2e3b