[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 8979b83f58  -s ours

Change-Id: I50a2aafaa9380ab1070575192a4610a45180aa8e
tree: 91044a36c8de378ec60f8483b94c4fffc332a436
  1. bluetooth/
  2. nfc/