[automerger skipped] Merge "Fix NPE in AutofillManager when feature autofill...

[automerger skipped] Merge "Fix NPE in AutofillManager when feature autofill is disabled" am: 782fa90b am: 1b0afb17 am: c61b65d3 -s ours

am skip reason: Change-Id I10ce988603f47117d0efddcc014ec51b72d3b3b4 with SHA-1 3cc809b0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie74ce06b74044063be69ea71517a37812bfdc5e8