Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37  -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 am: bd752f7d88  -s ours am: da12b4b0f0 am: 71831be462 am: 89024c7477 am: d460de187e" into nyc-mr1-dev-plus-aosp
am: 680c1388e6  -s ours

Change-Id: Iaf5e0f3dc490e9cc25668dd750e0a8ad5ccd8bff