Merge "Remove force transition logic when keyguard is occluded." into...

Merge "Remove force transition logic when keyguard is occluded." into sc-v2-dev am: c062a021 am: 3ae8b5f4

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

Change-Id: Ibee673bff19a6107f2451811029af346d32f486a