Merge "Remove wifi-service-resources from /system/priv-app"