tree 1caebbf20ea6686545bf87389150c87eda5e77f0
parent 532ba616767e561044f027d5eb2c3aa41a8a09e3
parent 71d47523345578480c6212e313244935205664d3
author Peter Li <lpeter@google.com> 1724916996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1724916996 +0000

[automerger skipped] Merge "Disallow device admin package and protected packages to be reinstalled as instant." into sc-dev am: b5d26f69c8 am: 1c656694a9 am: 54749a90ea -s ours am: 55496f95cd -s ours am: 575aa2719c -s ours am: aa494d6e08 -s ours am: 71d4752334 -s ours

am skip reason: Merged-In Ib1ed417072a3e942284e267e660631bd9e863248 with SHA-1 691d163e52 is already in history

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

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