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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79501aa89e25a7b2470bb3f2572b44b4db636a4b