Merge "Fix AutofillManager NPE" am: 8032074e61

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

Change-Id: I13b8fb4699966bfc748b087030f8f25d64bec521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>