Merge changes from topics "caitlinshk-csg-authripplecontroller",...

Merge changes from topics "caitlinshk-csg-authripplecontroller", "caitlinshk-csg-lightrevealscrim" into udc-dev am: 95ba0af9

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



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