Merge "Merge "New flag for lockscreen jank fix" into udc-dev am: 466273bb am: 5d788f79 am: 69733853" into udc-qpr-dev-plus-aosp am: 61fb1580

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



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