Merge "Do not add the MGF Digest tag for upgraded keys" into udc-dev am: 57b293ef

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



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