[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev
am: 1f8cb004 -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1 ab1ee5c2 is in history
Change-Id: I3becd255be392b7858a68302943deff735884477