Merge "Fix color mismatch of pointers" am: e1c169c983 am: 23ff2399a1

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

Change-Id: I52a57b66d2651b8fed6f80740b3463feb0a5c928