tree ea7262170872c3e521d68b6b77726fa99f6cbf41
parent b7bc3b7d64fbfb83ea04fc8f86c6055a7dd1068c
parent 4aa8851cc4d9f5a08526a8f55ff2b77d1c2ea2a4
author Sooraj Sasindran <sasindran@google.com> 1594331336 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594331336 +0000

[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 68a510ac32 am: 4aa8851cc4 -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: I82573c36fa140cbd15f207c8a649660f258e31ee