Merge "init: ro.boottime.init.modules" am: 74b03a16be

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1574952

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5695129a57f4c1c2675b13d76bfe9e512c64985f