Merge "[Autofill] Discard fill requests after save ui is displayed" into main am: ca310cd5 am: 7b50d083

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



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