Merge "sdcardd: ensure that init never executes sdcard daemon" into mnc-dev