Merge "Support multi sim on ims reg state change" am: 94356dccc3 am: a9db95a3f0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1549059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89aa07add2a4857d83bb82c269966ebeef5010f0