Merge "Merge "Revert "MGF1 Digest setter: Handle case of flag off"" into main am: ab71405e48 am: 4ad78ddc80" into udc-qpr-dev-plus-aosp