[automerger skipped] Merge "Allow vendor-init-actionable for ro.board.platform and sys.boot_from_charger_mode" into pi-dev
am: bd920a25a9  -s ours

Change-Id: I6538419f1eb83c4f2220e2fd02011698e020aa1e