Merge branch 'security-aosp-qt-release' into int/10/fp2

* security-aosp-qt-release:
  No longer export CallSubjectDialog

Change-Id: Id4e4b9fd20fcd63faa4c4793e667c4146309fe9b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e820f4c..c3a6f11 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -556,6 +556,7 @@
         <activity
             android:name="com.android.contacts.dialog.CallSubjectDialog"
             android:theme="@style/Theme.CallSubjectDialogTheme"
+            android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>