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

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

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



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