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

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

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



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