[automerger skipped] Merge "Migrate frameworks/base/wifi &...

[automerger skipped] Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd291 am: dc68043a am: a57f85b7 -s ours

am skip reason: Change-Id I9031a37c84e17c2cf5c0552d1b33e8fd59216b92 with SHA-1 dcab236e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I492101fb4f28555091631f196763566c3d4243e9