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

Change-Id: I4dfd467042f88821f88b1b3919ff06a489b9716f