Merge changes from topic "presubmit-am-8e7686c3d0724f199a67e46c3d7bbc94" into...

Merge changes from topic "presubmit-am-8e7686c3d0724f199a67e46c3d7bbc94" into sc-qpr1-dev am: 351c2247

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



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