Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev
am: 22046e7323

Change-Id: I06e960bef8fc2fdacfe9f6e4ecb1e970eb1e7cb4