[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 5f986e66 -s ours am: 4fb4251b -s ours am: 278124fa -s ours

am skip reason: Merged-In I033bea0386fdec4f9f93f788b802823a703aeade with SHA-1 a566994c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2185705



Change-Id: Ie7cb0efba64a136083cbd5cf48e99aecd27f720a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>