Merge "Don't prepare in-window animations if leaveKeyguardOpenOnHide." into tm-dev am: 6cd395206c am: cd6c9014ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169506 Change-Id: I70e640400f8b38bde7ab4df05fe26daac01a1c93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: