Merge "Fix toDrmMetricGroupHidl conversion"