Merge "Remove 'optional' from all frozen DCMs" into main am: f75a118ffa am: 160cede097

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

Change-Id: I51bc3b4f15a1d10ed231ec832efa738f95fe8a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>