Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware" am: 2c8f0de95c am: 7c2815e531 am: f95800d6ba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b71a7d1779a7f8fa47150be0a8f2549188d61df