Fork autofill default app selection am: ddf359d0 am: 270b54d8

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



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