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

Change-Id: Ic449186b2286d7c7fef91ebd4bf8f3c39a39dd6e