Merge "Make ScreenshotRequest handle hardware bitmap conversion" into tm-qpr-dev am: a5e45d31

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



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