tree 911756ad870c111d2f54332dfb458b0ddc695b1c
parent f104df8f2fdcd75c10e044b250df0ff81f9eb6e4
parent 0b1c69b181dc111dcf0b82a3e64dc959f5d45196
author Xin Li <delphij@google.com> 1599789743 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789743 +0000

[automerger skipped] Merge "Merge Android R" am: 572909e1cb -s ours am: 0b1c69b181 -s ours

am skip reason: Change-Id I07ed9f116d13f0e93647749bb64027479ddf7749 with SHA-1 7fd6cc9704 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1422343

Change-Id: Ie57b45980cae19a68396bb040a4bfd32eddcfff3