[automerger skipped] Merge "Reset Autofill dialog if the content is changed"...

[automerger skipped] Merge "Reset Autofill dialog if the content is changed" into tm-qpr-dev am: 4c30eee7 am: fb6fa1e9 -s ours

am skip reason: Merged-In I58503dd4021021d4bdc8d5114ff7255178fe5408 with SHA-1 2db6d676 is already in history

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



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