Merge "Run restorecon after init creates a symlink or writes to a file." am: c02b92a923
am: 80d2fdcac7

Change-Id: I4f0615f02c855c2e5a75d8387aad3351251222d3