Merge "[conflict] Merge "Support for cases where StatusBar cannot be hidden" into android11-tests-dev am: ddbda5a849" into android12-tests-dev