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

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

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

Change-Id: I0b4e533af63225ded3fd7970d93e198f9a6b9089
tree: 255ec0e389365f6d072b9aac0972afc5ca3a5dfe
  1. framework/
  2. OsuLogin/
  3. OWNERS