Merge "Unfreeze automotive HALs" am: 738c58dd50
am: 8b3da6948e

Change-Id: I7bcaa3fe306afa0fec6bb3a6a3e6517e4d66e1b8