[automerger skipped] Merge "Allow usage of SdkLevel in the framework/wifi...

[automerger skipped] Merge "Allow usage of SdkLevel in the framework/wifi services" am: 25b47559 am: 0f32078b -s ours am: 551bb47e -s ours

am skip reason: Merged-In I73cc38d7857934fe50995c666915662de4c154ce with SHA-1 4d8a34d3 is already in history

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

Change-Id: I1d724baf842041fabd6118f2fe751bb3fad1a460