Merge changes from topic "pss-app-selector-screenshot" into tm-qpr-dev am: 47c21d12

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



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