[automerger skipped] Merge "Make ScreenshotRequest handle hardware bitmap conversion" into tm-qpr-dev am: a5e45d3124 am: 26006c72dd -s ours
am skip reason: Merged-In I1041bbcfdc5f5ece6e98bd0844017d4f3dc4e9f3 with SHA-1 414f66073a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20894854
Change-Id: I230dc2f833102b2bc487a541d13c03b00f1e1420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: