Merge changes from topic "am-00f38fb3634941a49e5edf8317a21fe1" into tm-d1-dev-plus-aosp am: fae00190 -s ours

am skip reason: Merged-In I74a97424e93461372762cdf4a4b2bc8b9f83684e with SHA-1 1642ede3 is already in history

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



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