[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am:...
[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am: 05420811 am: 89d15a6a am: b51adbd6 am: 371bc3a8 -s ours
am skip reason: Change-Id Iaa75e8028e98998eca4c9b821aa07effab19dac3 with SHA-1 a6ac2a6e is in history
Change-Id: I2198cfeef260c108517ad65dfff2602c45394a20