Merge "Reland: "init: run property service in a thread""
am: 34f2537393

Change-Id: I6025edc7f49e8325d82afbc19924f4ef409b9822