Merge "HFP Client Permission" into nyc-dev am: 7233ef2
am: 1ec5798

* commit '1ec57986f4f67bbb645212611cb8614e2a4f317e':
  HFP Client Permission

Change-Id: I2a88d535367d134252aeb7bca2cabd82f0955101