Merge "[automerger skipped] Merge "Merge the changes about the tests repeated...
Merge "[automerger skipped] Merge "Merge the changes about the tests repeated setResolverConfiguration" into rvc-dev am: a40187cf -s ours am: e41c34bb -s ours" into rvc-d1-dev-plus-aosp