Merge changes from topic "include-uiccapptype" am: 614fd1b5 am: 237fc783

Change-Id: I1a51c429ff9db3ff33ae06267bdcf3fd54c16abf

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -591,6 +591,7 @@ filegroup {
		visibility: ["//frameworks/opt/net/ike"],
		srcs: [
		"core/java/android/net/annotations/PolicyDirection.java",
		"telephony/java/android/telephony/Annotation.java",
		],
		}