[automerger skipped] Fix the security issue that preloaded apps can get SSID &...

[automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a6 -s ours am: 0f311f7b -s ours am: 12f78710 -s ours am: 1e169e7e -s ours am: e159dbb0 -s ours am: ad158b70 -s ours am: 966a00ca -s ours am: 0fc824ea -s ours

am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 0684e7a6 is already in history

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

Change-Id: I8c62bdd6d90f566c78b118e8d0a7c80edb80d695