DO NOT MERGE - Merge RP1A.201005.006 am: 47db65777b

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

Change-Id: I97ea905b0f4f334e0b58ab1d86aadea17eea971d