Merge "Don't prepare in-window animations if leaveKeyguardOpenOnHide." into tm-dev am: 6cd39520 am: cd6c9014 am: be86f4c3 am: 35a959d8

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



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