[automerger skipped] Merge "Add null check for mCallback in AutoFillUI" into main am: 553c39b0e3 am: d3d924b984 -s ours

am skip reason: Merged-In I7d3f8fe399cb4e83f5f5fb80e27d232dad3b5b74 with SHA-1 ffbe20e7d3 is already in history

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

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