Merge "Fix color mismatch of pointers" am: e1c169c9 am: 23ff2399 am:...

Merge "Fix color mismatch of pointers" am: e1c169c9 am: 23ff2399 am: 6cddd8d6 am: 45a25dc1 am: bb3eec1b

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

Change-Id: Iad6662ed4026f10ee3cf13c2e92cb84e007a6cbb