tree 1e09bcdb11bed02de058474793ccc0bf70b66439
parent 0c2eb39dfbb3fd6f07742ee10a49572a6b30405c
parent 12f7871029999a41dc68746cdaaff66983fceab8
author lucaslin <lucaslin@google.com> 1620844254 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620844254 +0000

[automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours

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

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

Change-Id: I10032a99e96a46e9d685c4b1ac6835ef342fca16