Merge changes I47f206c2,I04774fe4 into stage-aosp-master am: 32707222 am:...

Merge changes I47f206c2,I04774fe4 into stage-aosp-master am: 32707222 am: aa0726df am: 1856bd35

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



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