Merge "Revert "Reland: "init: run property service in a thread""" am: 4adbd2905a
am: 3364822d76

Change-Id: Ib316f4e36cb2bf452f6dded492a33303e793872f