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

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



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