[automerger skipped] Merge changes Ia2ae5322,I09cfefbc into tm-dev am:...

[automerger skipped] Merge changes Ia2ae5322,I09cfefbc into tm-dev am: 406be8f9 am: 3fcce573 am: a99f87d1 -s ours am: 2fbc2d8d -s ours

am skip reason: Merged-In Ia2ae5322246c0553aafc084e0cc9f900f0e5ca5c with SHA-1 3549c59d is already in history

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



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