Merge "Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue...

Merge "Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: bb3ccf55  -s ours am: e4ae9577 am: cdff42091b am: 43ad88e6  -s ours am: 21d6c860 am: 3ed9e7693d am: c4012677 am: 232824e01c  -s ours am: c4e0b955 am: ea35b28d am: c396d522 am: 03ff2e19cb" into nyc-mr1-dev-plus-aosp
am: c0d21bc3  -s ours

Change-Id: I706c8b608a9aa89585f143dd084d41c4fbe234c8