[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 5b454a23 am:...

[automerger skipped] Merge "Use FLAG_UPDATED_SYSTEM_APP" am: 5b454a23 am: 586f2fb1 -s ours am: eedfafe5 -s ours am: 2e245e74 -s ours am: c95ef96e -s ours

am skip reason: Change-Id I5cb5b05d9319489c0106349f977b99e7bc0fefbf with SHA-1 07f470ca is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1300513

Change-Id: I2c3ee26a740308959895869379e5f31c3dfdd7bb