Merge "Revert^2 "MGF1 Digest setter: Handle case of flag off"" into main am: 9fa4063071

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

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