[automerger skipped] Merge "Update screenshot class visibilities for app...

[automerger skipped] Merge "Update screenshot class visibilities for app clips." into tm-qpr-dev am: 3e7dab65 am: e8525284 -s ours am: 9ddf1073 -s ours am: f115dfa4 -s ours

am skip reason: Merged-In Ib364c11bdf94d9364e52393722a5012614ee2a35 with SHA-1 27fb0488 is already in history

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



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