[automerger skipped] Merge "Move wifi related hidden API flag file entries to...

[automerger skipped] Merge "Move wifi related hidden API flag file entries to packages/modules/Wifi" am: 077513c4 am: 4eba0fef -s ours am: a002fdec -s ours am: b099669f -s ours

am skip reason: Merged-In I45f46f9aebb90ca9ff0a60c37068b94238354578 with SHA-1 ecd5356f is already in history

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

Change-Id: Ic8cc97be38fb688d41176898eb0750869eb164cd