[automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours

am skip reason: Merged-In I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec with SHA-1 e67b0c3aee is already in history

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

Change-Id: I1c25c89f9863d673c6b78be63556ffb63b6d720f