Merge "Fix color mismatch of pointers" am: e1c169c983 am: 23ff2399a1 am: 6cddd8d6b7 am: 45a25dc11b am: bb3eec1b51

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: Iad6662ed4026f10ee3cf13c2e92cb84e007a6cbb