[automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly...

[automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp am: f33b7dd3 -s ours

am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c748645 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3683521b0a0ad208e33315f62fc423452543f741