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

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

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

Change-Id: I54b0cdaeb4983940cd10ea53d0d4122141170100