Merge changes I6025b029,Ibe703eb9 into tm-dev am: 18ef64a2 am: 581a7d6c am: d7a34b41

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



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