Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE

Merged-In: I43fee240a64460056cb0b575504dba0895806dd2
Change-Id: I1eb1812047aaf09e96f10f68e36044d872498a2f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a222705..2b2df11 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,6 @@
 
     <original-package android:name="com.android.phone" />
 
-    <protected-broadcast android:name="android.telecom.action.TTY_PREFERRED_MODE_CHANGED" />
     <protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
     <protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />