[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-2008250-surfaceless-DBCDCMVRTS" am: 989e5479 am: 95409114 am: 64ac17fc -s ours am: 0edb1895 -s ours am: 2510f2b5 -s ours

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

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

Change-Id: I65b9e016626e13fa0483b769eb58cdd55e7ec947