[automerger skipped] Merge changes I6025b029,Ibe703eb9 into tm-dev am:...

[automerger skipped] Merge changes I6025b029,Ibe703eb9 into tm-dev am: 18ef64a2 am: 581a7d6c -s ours am: 6da8fd50 -s ours

am skip reason: Merged-In I6025b0291384d69503aeac5f6da75931d16f75b2 with SHA-1 a54608bd is already in history

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



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