Merge "init: simplify async restorecon" am: 7a03b5d314
am: b7bcfdbdda

Change-Id: Ic739982f31e759428b3f018ed39fce68dd3ebe80