Merge changes from topic "presubmit-am-5e401df0c9104b748d29f5c632e4fdd1" into...

Merge changes from topic "presubmit-am-5e401df0c9104b748d29f5c632e4fdd1" into tm-mainline-prod am: 19c960d0

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

Change-Id: I8f57d0ab21109f3343121352f3a35e74742f703c