Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609

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

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