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 am: 63ce994e
Change-Id: Ibe43eb97cee3653f49173151022ba984aae4b72e