Merge "Migrate to ScreenshotData object" into tm-qpr-dev am: 6378bd57 am: 881ac485

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



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