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

Change-Id: I2189cbff8e97b3aaa5bd335806d5d1ea9ea21225