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

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

Change-Id: I55b3072811a9f11ab88c886b48707217d688fc70