tree b9a3d037be804565f315f02b76acc6e96086c9f8
parent b7835941deb74f5414f597528129da44058639c3
parent 9e14c9196565f5da7db9e1d506818a28d70751d6
author Xin Li <delphij@google.com> 1596729738 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596729738 +0000

Merge "Merge QQ3A.200805.001" am: a8fbfa0313 am: 9e14c91965

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

Change-Id: Ib36dea00e6afaf0cedaaf55a1edffea8cbcb91e2