[automerger skipped] Merge "Fix PixelCopy & BQ crop" am: c9885f1fa4 am: 0701f7ea4c -s ours
am skip reason: Merged-In I5f638153baed7f67dc43fe9ecb4587f579222b5d with SHA-1 2abc5494d8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1732333
Change-Id: I4c906bd1cbbab19c0ef8df44d4f482ef44a90afc
This commit is contained in: