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

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



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