Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc  -s ours
am: 3a20f7ceac

Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03