Merge changes I455a3fd5,Ie076c1e2,I95c7d996,Id879b427 am: 3778a39272 am: ea596a0176

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

Change-Id: I5f7626ecd9d7d140ce75c64b51d5366401ac8c1a