[automerger skipped] [DO NOT MERGE] Transitions: LOCKSCREEN->DREAMING am: d991f01a22 am: cdecfd692d -s ours

am skip reason: subject contains skip directive

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

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