[automerger skipped] Fix keyguard dismiss animation with occludable activities. am: 07d87012c1 -s ours am: a4acf35a96 -s ours am: 14601df875 -s ours
am skip reason: Merged-In Ie80187a5ca9b61b8178bbe977bf252db654d9fa4 with SHA-1 1a3135ee5c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18494316
Change-Id: Id3001a91ddf310d802178d968590f883b6cf51fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
11dae4f482