Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392f3 am: 7cd4021230

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6afa3134eec13cd72f777c4f0e33bb579eb58177