[automerger skipped] Merge "ServiceWifiResources: split into own folder" into stage-aosp-master am: b8c22e5813 -s ours

am skip reason: Change-Id I9377663f07158057592f5b3ad3c0738fcb6c7504 with SHA-1 036cba6b1c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/13275661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ec2104fee7d03e8687644afad728db5c2e6bee3