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

* commit '7233ef22ef37fc57fb24f37579a4a1018b6ff58f':
  HFP Client Permission

Change-Id: I61c7be2561564842c045ba669176dfa939e774e1