Merge changes from topic "presubmit-am-5c52842bbd2241ae9eee16763ebedbd7" into sc-qpr1-dev am: 1a7cfafe

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

Change-Id: I3ce0ae7a4486b3688c1bade43e0493bfe68f9598