[automerger skipped] Merge "Fix the bug of losing Wi-Fi certificate when...

[automerger skipped] Merge "Fix the bug of losing Wi-Fi certificate when editing" into rvc-qpr-dev am: 3b4744a6 am: 6cb2744f -s ours

am skip reason: Change-Id I947fb7668ffa7e9ed8c150fe14e6ae9d7a67393c with SHA-1 c95baa23 is in history

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

Change-Id: Ib9de68b588fc5dcbecdbb864bfd1bc60f9bacb5f