[automerger skipped] Merge "Change SubscriptionController to make subscription...

[automerger skipped] Merge "Change SubscriptionController to make subscription unique by ICCID" am: 9fc82a2e am: 974d56bc am: 40d7042d -s ours am: bdbaa3e1 -s ours am: 73b08c07 -s ours

am skip reason: Change-Id I0e486e08735707a23c2ece66b2c6b6db356b6a55 with SHA-1 d923bce0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8589565038b57855ac31270b4fdc0b232f4b7ec2