[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: f7f31e4b -s ours am: 39a4f3d2 -s ours am: 19526305 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1674672

Change-Id: I995d017caa8dcd6606d57cb2ff604277d986bd37