Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev am: 81a36464

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23875506



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