[automerger skipped] Merge changes from topic "revert-2008250-surfaceless-DBCDCMVRTS" am: 989e5479fe am: 9540911495 am: 64ac17fc07 -s ours

am skip reason: Merged-In I7e53a8a28157023658baac0778033159bdd2285e with SHA-1 6ba85d9391 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2008250

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2009579

Change-Id: Ib832a526f498188b46de7bf4e48398558d598df7