Merge "init.rc: fix (re)starting apexd on FDE devices"