Merge "Transitions: Limit how to LOCKSCREEN can be interrupted" into udc-dev am: 9bfbfcc4 am: 7aa02088

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



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