Merge commit '7419b297' into fix-merge-conflict

* commit '7419b297':
  Prepare to make SubscriptionManager public.

Conflicts:
	src/java/com/android/internal/telephony/IccProvider.java
	src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
	src/java/com/android/internal/telephony/SubscriptionController.java

Change-Id: Ibec2f9135f3073e02fc667ea91b1faf7e6236436