Merge changes from topics "android-os-connectivity-wifiactivityenergyinfo", "requestactivityinfo"

* changes:
  Move WifiActivityEnergyInfo to android.os.connectivity
  Formalize WifiManager#requestActivityInfo as @SystemApi
tree: ec508c779f8940dce32ac2a1d16260ca414d5554
  1. apex/
  2. service/
  3. PREUPLOAD.cfg