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

Change-Id: I25f94e233431107acf953b590c156aaff8428a81