Merge changes from topic "revert-2008250-surfaceless-DBCDCMVRTS" am: 989e5479fe am: 9540911495

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

Change-Id: I31f50c7fe3182fbf0810503c3ca0c617ce175ba1