Merge "Merge "Surface should not be created for WindowContext initially." into...
Merge "Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c am: a8b98c6e" into rvc-d1-dev-plus-aosp am: 47eed559
Change-Id: Iacbc0438b90279de8ee420c1dd5afc1fa9a0f23d