Merge "[OsuLogin, WifiDialog] Remove explicit targetSdkVersion" am: 15dc0e6d25

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/2193796

Change-Id: I93ba6d21693175984da8de3aaccdcceea03318fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>