[automerger skipped] Merge "Add AppTransition type and remote animation for Dream in occluding Keyguard." into tm-qpr-dev am: f8e4efccda am: c3bebf9ff1 -s ours
am skip reason: Merged-In I5517ded2eea77ea962ca1551ed51dd997ff09993 with SHA-1 71223c6e62 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19469267
Change-Id: I4bd11768b5e4d35e8a633913421cdb8392c58016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: