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

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



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