[automerger skipped] Merge "Do not add the MGF Digest tag for upgraded keys" into udc-dev am: 57b293ef31 -s ours am: 84fee14c78 -s ours am: 08e94e15fd -s ours
am skip reason: Merged-In I0f1fa7983f9c771bec3196c6a617eb7044ac2e79 with SHA-1 05d0463907 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23588897
Change-Id: I76a9baf537d8d5ef7edc90bdeffc494003332fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: