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

Change-Id: I815bf3aa060005b8c3f0512e38042ae377c8e236