[automerger skipped] Merge "Fix Invalid Surface error" into main am:...

[automerger skipped] Merge "Fix Invalid Surface error" into main am: c3199051 am: a412668a am: 47f794da am: a49a2cfa am: 49e37d2e -s ours

am skip reason: Merged-In Ib2a68f7488724370e44da28bdc30c8db19085889 with SHA-1 75538e0a is already in history

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



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