Merge "Update virtual display size before turning it on." into rvc-dev am:...

Merge "Update virtual display size before turning it on." into rvc-dev am: 16868fbe am: 34e1bd04 am: b2fe67d6 am: c201c7e4

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

Change-Id: I3a335ac3a8a740073f659bbddf359a6d52569b27