Merge changes I121b9246,Ib8227067

* changes:
  AndroidManifest.xml: Mark NETWORK_SETTINGS_RESET broadcast as protected
  Intent: Promote broadcast flag needed by wifi to @SystemApi