[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: 3a26a18f -s ours am: 1b780ae1 -s ours

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

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

Change-Id: I7eee378d316649867563776343c2d8fba34c6653