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

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



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