Merge "[DO NOT MERGE] DREAMING->LOCKSCREEN, lockscreen updates" into tm-qpr-dev am: 0b0d8d8088

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

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