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

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

Change-Id: I75e309cf0e3f13d0fc08b8f9253ac5a9df33b956