[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: e97d1f54 -s ours am: e100b244 -s ours am: 0c2eb39d -s ours am: f793f651 -s ours am: 0447af09 -s ours am: c0d4f244 -s ours

am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c7379267 is already in history

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

Change-Id: I42efdbb89b77bf84e9349d3f47395403651476cc