Merge "PSS: Make sure shade is dismissed when starting the app chooser" into udc-qpr-dev am: 7717431bd3

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

Change-Id: I076e5d91e8a95f86aa841fa3a05df039311fe182
Signed-off-by: Automerger Merge Worker <[email protected]>