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

Change-Id: Iedb74f126c36151543fee059d71b11842ffaed3e