Merge "Merge "Fix AutofillManager and Session status not sync with fill dialog" into tm-dev am: 13809feb am: a23a8274" into tm-d1-dev-plus-aosp am: e2fbf666 am: 45b5f5aa

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



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