Merge "system_server: bring back sdcard_type neverallow rule"