Merge "init: only set ro.boottime.<service> properties once." am: fe0607575d am: a1a6826c59 am: a82cc92437 am: bc4a6c49d9
am: 9128a0ba32

Change-Id: Ia3ed881b1ed5b624b11309c4144fe44d0504428f