[automerger skipped] Merge "Do not add the MGF Digest tag for upgraded keys"...

[automerger skipped] Merge "Do not add the MGF Digest tag for upgraded keys" into udc-dev am: 57b293ef -s ours am: 84fee14c -s ours am: 08e94e15 -s ours am: d15c13ec -s ours

am skip reason: Merged-In I0f1fa7983f9c771bec3196c6a617eb7044ac2e79 with SHA-1 05d04639 is already in history

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



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