Merge "Revert "PSS: Make sure shade is dismissed when starting the app ...""...

Merge "Revert "PSS: Make sure shade is dismissed when starting the app ..."" into udc-qpr-dev am: 433adc3e

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



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