Merge "[automerger skipped] Merge "Exclude some tests in AppConfigurationTests" into android12L-tests-dev am: 7212814c25 -s ours"