[automerger skipped] Merge "Do not add the MGF Digest tag for upgraded keys" into udc-dev am: 57b293ef31 am: eb774923b9 -s ours am: 748894eee1 -s ours am: de41a6ae22 -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: I41291bd3511bb4dab6787ce496297252051f215c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: