[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 93dee6c048 -s ours am: 31beaa3e1b
am: e5d24c694a

Change-Id: I157b49d41bb007073be387595a1552f63dd9435b
tree: 08b21f535c3ab0791a9d6468af56866bebfaef40
  1. bluetooth/
  2. nfc/
  3. OWNERS