Merge "New flag for lockscreen jank fix" into udc-dev am: 466273bb am: 5d788f79

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



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