[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am:...
[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am: 05420811 -s ours am: a56ae607 -s ours
am skip reason: Change-Id Iaa75e8028e98998eca4c9b821aa07effab19dac3 with SHA-1 a6ac2a6e is in history
Change-Id: Iea15c729bac0af8b76185034f95ec8f11cfdd545