Merge "Fix color mismatch of pointers" am: e1c169c983

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

Change-Id: I4a6d02a70131d3680b650db6f8feef4ef1add0ed