Merge "Merge "Fix chooser handle color." into tm-dev am: e55d23f3 am:...

Merge "Merge "Fix chooser handle color." into tm-dev am: e55d23f3 am: 78803a58" into tm-d1-dev-plus-aosp am: 284f1999

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



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