Merge "Merge "Account for the bouncer's scrim in LightBarController" into...

Merge "Merge "Account for the bouncer's scrim in LightBarController" into udc-dev am: b7a3e01b am: b19a97ec" into udc-d1-dev-plus-aosp am: 6ca74941

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



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