Merge "Allow vendor-init-actionable for ro.board.platform and sys.boot_from_charger_mode"
am: a5bf7bad2c

Change-Id: I804fb0889f947d041be38ca2138eab99296536de