[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