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

Change-Id: Ia8f7a556dcc83724e897511647df978d3d61255d