tree e5e4dd6e24c81d50ffbdb264ea94d59fb522c05d
parent 9cc303afd0d6e8c45bee7e4876c39d4c702f8620
parent 32aa2f216705c77800c7a57dd15aea546501f94b
author Bill Yi <byi@google.com> 1600494692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494692 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: aadd6bf231 am: 32aa2f2167 -s ours

am skip reason: Change-Id I4cd9725b3049dc96a56a723902470fd89501b9f8 with SHA-1 f4a979987e is in history

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

Change-Id: Iced4300cac75305552f3782b458d5a3c1b264944