Merge "boottime/init: Report ro.boottime.init* properties in milliseconds." am: 7dde4fa4e2
am: 1512241b68

Change-Id: I018be3b42d250a0ed942f8fa883f8f17fa07c383