[automerger skipped] Merge changes from topic "phone_switcher_new_package" am:...

[automerger skipped] Merge changes from topic "phone_switcher_new_package" am: f78c4832 am: 26f371eb am: b88ded80 -s ours

am skip reason: Merged-In Ic5327d9c31864dac2eb543653d3bce55396742df with SHA-1 e64909ce is already in history

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

Change-Id: If69c4cd8c1946d305c3db0e9b9fa79fb26bde1ef