[automerger skipped] Merge "Add a property for Numpad Button text color" into...

[automerger skipped] Merge "Add a property for Numpad Button text color" into sc-v2-dev am: 72c0ffd9 am: 77308c61 -s ours

am skip reason: Merged-In I9d63f89f31fcc69a45817abd73fca4a4a283a7b2 with SHA-1 9dd830b2 is already in history

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

Change-Id: I7ccfdc1b664991cf1d3297da7d77cf7fcf6321c8