[automerger skipped] Merge "ServiceWifiResources: split into own folder" into stage-aosp-master am: b8c22e5813 -s ours am: 9315a0328a -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: Ic3e8a7b04d48caa9c8453a2419c4fab25dac6747