Merge "mark more hals as optional in frozen matrix." am: 55b2fddbb7

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

Change-Id: Ib6b18598122f2e5848f34a5c27370c40432de7f8