Merge "Fix multiple issues with DREAM => LOCKSCREEN transition" into udc-qpr-dev am: 6005ff64

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



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