[automerger skipped] Merge "Enabled SYS_MODULE capability for wifi@1.0-service" am: 61896fc0ee
am: 57b06ffb3d  -s ours

Change-Id: I1f6c7dfbe20776e8a75af3037c4bb58945347f53