Merge "Account for the bouncer's scrim in LightBarController" into udc-dev am: b7a3e01b am: 9ee6d8c0

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



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