[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 68a510ac am:...

[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 68a510ac am: 4aa8851c -s ours am: b5398d04 -s ours am: d9ca8a3a -s ours am: ebbf1b35 -s ours

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

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

Change-Id: I838d36977021a7b904970be78f352b90d3c8c6fe