Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev