[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 08730df46f -s ours
am: 25c65226e2

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