tree 28c4e35a0407509ae634f0003d68caeff268b58d
parent 094fdbea4b414e2d1a8b72eabc446f34c25f9151
parent 3fe06d20e61d144279ad6a0e6412b9c3f8c26fe8
author Xin Li <delphij@google.com> 1655496386 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655496386 +0000

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 3fe06d20e6 -s ours

am skip reason: Merged-In I430bba6daddb35e6280b4fe7146551f9ec661e67 with SHA-1 97547d7ef8 is already in history

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

Change-Id: Ic8c9aa98ee5c4e6aa416bbe69b7b55cd3c371ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>