Merge "Bluetooth: Change keyboard icon to normal system color" into oc-dr1-dev am: a0c6ea0eaa
am: 7136ec213e

Change-Id: I0fefc1a8dc3c6c694f523b7eacb8e16bb8fa00ac