Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin"