Merge "Do not add the MGF Digest tag for upgraded keys" am: 61949e6125 am: b37825fc4c am: ec976c0e70

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

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