Merge "init: consolidate restorecon after selinux initialization in single function"
am: 273a0624c5

Change-Id: I417d2bee37d91fa27eb7819ef463552d48c1f36d