Merge "Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c -s ours am: 257cf16de3 am: c96f655395 am: 4a496b0810 am: 03ff2e19cb" into nyc-mr1-dev-plus-aosp
am: 102578f0d5 -s ours
Change-Id: I706c8b608a9aa89585f143dd084d41c4fbe234c8
This commit is contained in: