Merge changes from topics "128902411", "128645056"

author Xiangyu/Malcolm Chen <refuhoo@google.com>

Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
author Xiangyu/Malcolm Chen <refuhoo@google.com>
Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
diff --cc api/current.txt
Simple merge
diff --cc telephony/java/android/telephony/SubscriptionManager.java
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	Xiangyu/Malcolm Chen <refuhoo@google.com>
	Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/SubscriptionManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history