[automerger skipped] Merge "Fix WifiConfiguration#getAuthType" into mainline-prod am: 6a512dadfc -s ours

am skip reason: Change-Id I85796299f119b84781148c949d701d10da506dc2 with SHA-1 d0b1a13e0f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12730649

Change-Id: I0b4e533af63225ded3fd7970d93e198f9a6b9089