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

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

Change-Id: I06b92d1f21782059784a0f9bad6751c32ae8a24c