[automerger skipped] Merge "Fix PixelCopy & BQ crop" am: c9885f1f am: 0701f7ea -s ours am: f21cdd93 -s ours am: a4ba7b50 -s ours

am skip reason: Merged-In I5f638153baed7f67dc43fe9ecb4587f579222b5d with SHA-1 2abc5494 is already in history

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

Change-Id: I128cb5966f20dfbd44174a8ba1abd9e384fd1d03