[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 skip reason: skip tag Change-Id Ia5ca732e8464d02a3c5a7b1b75f4c6afbe441fb1 with SHA-1 ca0a0745 is already in history

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

Change-Id: I9c55d16f68ac58b32442b07ef2d29e4112b51968