[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: e6157066 -s ours am: 5d6ddac5 -s ours

am skip reason: Change-Id Ieabd1acd1d5480dff41c315fb0122050e03e4736 with SHA-1 65923e47 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic60f0725f216b31350f6690b39d416e567abb91e