Merge "LockscreenShadeTransitionController: extract logic of keyguard and scrims" into tm-dev am: 941937ea1c

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

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