Merge "Do not animate dialogs into activites when locked (1/n)" into tm-qpr-dev am: 4dd23413

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



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