Merge "Fix mismatching intent filter string in AndroidManifest.xml"

        <receiver android:name=".TestingSettingsBroadcastReceiver">

            <intent-filter>

                 <action android:name="android.provider.Telephony.SECRET_CODE" />

                 <action android:name="android.telephony.action.SECRET_CODE" />

                 <data android:scheme="android_secret_code" android:host="4636" />

            </intent-filter>

       </receiver>