Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:...

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: c0995d63 am: da2d3ac8 am: 7dcee98d  -s ours am: b26c009f am: dddb99f020 am: 1725b04d am: bd752f7d88  -s ours am: b70ca3ef am: f459f41d am: 2ff818a8 am: d460de187e" into nyc-mr1-dev-plus-aosp
am: 3a06c49b  -s ours

Change-Id: Iaf5e0f3dc490e9cc25668dd750e0a8ad5ccd8bff