[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 68a510ac32 am: 4aa8851cc4 -s ours am: b5398d04e8 -s ours

am skip reason: Change-Id I1991e98bb1edb7d0628a7011df7488fbf5de3579 with SHA-1 af41d87ede is in history

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

Change-Id: Ie37629a2e67ecd34d038508e5e80b886bda6f0b0