[automerger skipped] Merge "Fix AutofillManager NPE" am: 8032074e am:...

[automerger skipped] Merge "Fix AutofillManager NPE" am: 8032074e am: 8b6b4752 -s ours am: 4d7acb3e -s ours

am skip reason: Merged-In If56d690882e8d4ad0dba1534f127478089c4d04f with SHA-1 1b57e4cc is already in history

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



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