Merge "Merge "[Bouncer] Update colors for pin pad" into tm-dev am: 3079ea52...

Merge "Merge "[Bouncer] Update colors for pin pad" into tm-dev am: 3079ea52 am: d04b941f" into tm-d1-dev-plus-aosp am: 3c1ca14b

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



Change-Id: I1c2e4fb0d735fe515175022db8abbbbc2d37aa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>