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

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

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