[automerger skipped] Merge changes from topic "virtual-display-alloc-sc-dev"...

[automerger skipped] Merge changes from topic "virtual-display-alloc-sc-dev" into sc-dev am: fda42697 am: b7d24c60 am: c92e4ed9 -s ours

am skip reason: Merged-In Ia09b120dce1a4659a3cbb8927d44da8fba266c54 with SHA-1 0deb06ec is already in history

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

Change-Id: I56459b6766402b5fa9a6ca8c63eb26a62fbc9643