Merge "Fix NPE in AutofillManager when feature autofill is disabled" am: 782fa90be7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f8a8f1370fb9523f8a67b5ccafbe101aa495709