[automerger skipped] Merge "Set default value for performant auth." into...

[automerger skipped] Merge "Set default value for performant auth." into tm-qpr-dev am: ead95a42 am: 7882fe06 -s ours

am skip reason: Merged-In Ibbad0165f4ef396be70d3a566ca77597c2bcbb8e with SHA-1 c54771a1 is already in history

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



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