Merge "Revert "MGF1 Digest setter: Handle case of flag off"" into main am: ab71405e48 am: 4ad78ddc80

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2853709

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