Merge changes from topic "sysui-screenshot" into tm-qpr-dev am: e8e170f5

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



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