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

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

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



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