Merge changes from topic "virtual-display-alloc-sc-dev" into sc-dev am: fda426973e

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

Change-Id: Iab7f1768530bc6b343815f3da2111d23e0b4595d