Merge "Code sync with aosp to resolve merge conflict" into stage-aosp-master...

Merge "Code sync with aosp to resolve merge conflict" into stage-aosp-master am: 4730b221 am: 09dea658 am: 19a32816

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



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