am ba7a99f9: am b71626a9: Merge "Change pairing api/intent permission from...
am ba7a99f9: am b71626a9: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev
* commit 'ba7a99f9':
Change pairing api/intent permission from PRIVILEGED to ADMIN