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