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 am: 086c31ba

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



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