Merge "Migrate to ScreenshotData object" into tm-qpr-dev am: 6378bd57cf

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

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