Commit 73101613 authored Jul 20, 2020 by Jack Yu Committed by Automerger Merge Worker Jul 20, 2020

[automerger skipped] Merge changes I53c01060,Iff8c36f5 am: 53811b99 am: 2d74d181 -s ours

am skip reason: Change-Id I53c010608dd8796003b33f8ba0f4249108aecee2 with SHA-1 1559a6e2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1367557

Change-Id: I021b1ba215826d794a28ec93e84b980e7b2d34e1

There are no changes