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

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

Change-Id: I10f5fcb9874bed209a70e61db875afcf6d7c9795