Merge "Merge "Backfill display_mode configuration for all the tests without the configuration." into android11-tests-dev am: 03bc712bce" into android12-tests-dev