Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01  -s ours am: 5c950df332 am: 1dc5800553 am: e45190af67
am: 72c9d444c3  -s ours

Change-Id: I69d37a74d8d4fe28de81b66a683040a2e67616ad