Merge "Reland "Set vendor: true for boot control HAL"" am: 9ba23d0c78
am: ca193eb98b

Change-Id: Iac4ef682572da17ce087631be21ee70d0b505b92