Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: 95d6ec4a52

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242
tree: e76f91dd5f29c358ce5cada794ec8d7508d9eafa
  1. core/
  2. services/