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

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

Change-Id: I1d8d5be98740304cb67515d00de60726bb1e733a