Merge "[Shell Transition]Fix occluded activity could show behind keyguard."...

Merge "[Shell Transition]Fix occluded activity could show behind keyguard." into tm-qpr-dev am: c050b87f

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



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