Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 5a67a7e0c3

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

Change-Id: I203025a99837e534b2b3d481dd565d5e4492c631