Merge "Fix Invalid Surface error" into main am: c3199051ac am: a412668aea am: 47f794da52 am: a49a2cfab2

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

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