Merge "Revert "mark more hals as optional in frozen matrix."" am: b1718de4ad am: 1706a4dd3f am: 44179bdca6

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1474816

Change-Id: I1881b6c981856d740933bc6abdce92d4f808fc85