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 am: 4601f4cc

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



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