Merge "[automerger skipped] Merge "JustWorks: Auto-accept only incoming...

Merge "[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev am: 1f8cb004 -s ours am: 96db9f70 -s ours am: fe5e156d -s ours am: 5f49b028 -s ours
am: d8a187a5 -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1 ae9913fd is in history

Change-Id: I9efcb1c427af206937131b331846ba501d27846e