[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: c83da3c004 -s ours am: 8f3623d986 -s ours am: e1024e59a1 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/15257336

Change-Id: I37fd75237ddc5b4892035fa7468175a95036547c
tree: 1786d6e957975a67c408659fce88190a04bc6208
  1. android/