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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie63cb44e6ca63d40155b306312b96c566054f148