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

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

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