[automerger skipped] Merge "Merge RQ2A.210305.007" am: d7a7c14f -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: d7a7c14f -s ours am: 826db006 -s ours am: 2d83a4a9 -s ours am: 5c4031fa -s ours

am skip reason: Change-Id I2123f3715a33bece5a9e8127d45d01fbe22a4224 with SHA-1 ee6e9954 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ce81ef70ede9f315fc0710cd0462f5872de9f6d