[automerger skipped] Merge "Merge "Retry calls to AutofillManager.isEnabled()..." into pie-cts-dev am: 2b1974b368" into pi-dev
am: 40e6bfbfb5 -s ours
am skip reason: change_id I413d2e9b714cf0e17689835c7a27e30675d32d91 with SHA1 7fb68cdce9 is in history

Change-Id: If280a2524e6fefe1bee5c0c9b4f91d26844bafe8