Merge changes from topic "presubmit-am-2f3f99b5aba34369bfb1f64c170a4177" into tm-mainline-prod am: 7f03de35

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

Change-Id: Ic669ce89f76292679d4b549541991c80335f9600