Merge "Change how TelephonyManager handles subscriptions." into nyc-dev am: 4c04097fdb
am: 531cd8724c

* commit '531cd8724cad56e2a141dbe5acbe283372c21de4':

Change-Id: I60f30d1169e65fde080d398a06d2b543a0278238