[automerger skipped] Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392 am: 7cd40212 am: 737529ea -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie61262ddf5de547fd0606029ecbaed5182adc45e