[automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075f am: c4f1bd96 -s ours am: 2b35467f -s ours am: 86b03a25 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63295ad558fe195ce466eb16d444ad8f5ee3a25d