Update SubscriptionManager API as per API council.

bug: 17575308

Conflicts:
	api/current.txt
	services/core/java/com/android/server/location/GpsLocationProvider.java
	telephony/java/android/telephony/SubscriptionInfo.java
	telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic97997613c08be737c24f98e66b92b21d83e9c81
12 files changed