Merge changes Ic196ef31,Ifeb8d038

* changes:
  Uses a custom JUnit rule to preserve value of autofill service settings.
  Moar PERF tests for autofill.