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

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

Change-Id: Ie024c5215c9c192702c5b4be4ee392199969fdef