Merge "init: consolidate restorecon after selinux initialization in single function" am: 273a0624c5 am: 68fb7c0bbb
am: fb79b10200  -s ours

Change-Id: I661b60f4e32c6fd7524a49506fa8aa071fadc6e0