Merge "Update Bluetooth to use adaptive icon." am: d0e8d2cfd0 am: 337243f71e
am: ecd2909306

Change-Id: I1c8c793a725f9064217bb2799389d04ebb9eb090