[automerger skipped] Merge changes I6a74fcaf,I4499dc5c,Ie308b4da am:...

[automerger skipped] Merge changes I6a74fcaf,I4499dc5c,Ie308b4da am: fae1d114 am: 73181f5c am: a8595c05 -s ours

am skip reason: Change-Id I6a74fcaf60f66e49a389ae9840a925dc789940f1 with SHA-1 b2a68cca is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c19bce8b87ef1a952502d3081d7d04eb510b65c