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 am: 2ceb6178

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



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