[automerger skipped] Merge "Fix multiple issues with DREAM => LOCKSCREEN transition" into udc-dev am: 22f183e976 am: 53ccbed5ce -s ours
am skip reason: Merged-In I0a8e096d9e6c08f0ce2e7736fb5679951602cfe0 with SHA-1 d6c544b125 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23353336
Change-Id: I3001e1e267dad5b143116de8b1d991578e86edd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: