Merge "Do not add the MGF Digest tag for upgraded keys" am: 61949e61 am:...

Merge "Do not add the MGF Digest tag for upgraded keys" am: 61949e61 am: b37825fc am: ec976c0e am: 6b22231a am: f576f67a am: 70028779

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



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