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

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



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