[automerger skipped] Split updatable/non-updatable Wifi APIs into separate directories am: 4e461c5a9f -s ours

am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20d7913d7127a12b44bd5b4a71a2f65375fd1534