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