Merge "Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb am: 531cd8724c" into nyc-mr1-dev-plus-aosp
am: f322db1e0d
* commit 'f322db1e0db11c670c34bea6014c3d43f030941b':
Change-Id: Ie16b5e1b2c2012282cb3777ca4ea8fa2954264e1
This commit is contained in: