Merge "ServiceWifiResources: split into own folder" into stage-aosp-master