Android O MR1 IOT Release 1.0.7 (5157592)
Merge pie-platform-release to aosp-master - DO NOT MERGE

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