tree 6269078a8526047f4a9a8a2731ecd622a375ff06
parent 12ed485fe2f0d9554c242afad8ff100ae80d8af5
parent 28c30b5ff73ce1465e98fdb238b39f51d5c926b0
author Xin Li <delphij@google.com> 1614810530 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614810530 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 28c30b5ff7 -s ours

am skip reason: Change-Id Ia061376a9529a5e4fdec5e9f6b87329118b8d95e with SHA-1 3c31a1b599 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99c710662de4b33d47c9bee2488ddf89a8918a2e