Merge "Fix html injection in Autofill confirmation dialog" into tm-qpr-dev am: ecb7c54f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20904550



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