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

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

Change-Id: Ie240a26b035ea6d31653b06e0922a18f4c774a27