[automerger skipped] Merge changes from topic "surfaceless" am: fd39c147 am:...

[automerger skipped] Merge changes from topic "surfaceless" am: fd39c147 am: 44ac624e am: 57676af8 -s ours am: 3f3a4aaf -s ours

am skip reason: Merged-In Id01e677175a2cf98f4d893e21f3c654375772153 with SHA-1 c7c4aa32 is already in history

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

Change-Id: Ie64a736e11a0407401b7882fe54571556ca359d8