[automerger skipped] Merge "Enable the clear credentials buttons when wifi keys are installed." am: 5f1034bce0
am: 2b98c25bcf
-s ours am: 8e34fc722f
-s ours
am skip reason: Merged-In I69828b64a7e3c707c27b4582d64ff0ddb863a4ff with SHA-1 fae7509721
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1725994
Change-Id: I61d0e3fc95ac7609109302c7ca9fa8db6f8347fd
This commit is contained in: