Docs: Remove security@android.com and replace with bug queue where applicable

Bug: 21730350
Change-Id: Idab7405bfb723353b2dd66d4de7d65b8ca0bc673
diff --git a/src/security/overview/updates-resources.jd b/src/security/overview/updates-resources.jd
index 8c8d047..5bd893e 100644
--- a/src/security/overview/updates-resources.jd
+++ b/src/security/overview/updates-resources.jd
@@ -31,9 +31,10 @@
 
 <p>The Android security team finds security vulnerabilities through internal
 research and also responds to bugs reported by third parties. Sources of
-external bugs include issues reported through the <a
-href="https://code.google.com/p/android/issues/list">Android Open Source
-Project (AOSP) bug tracker</a>, published and pre-published academic research,
+external bugs include issues reported through the Android Open Source
+Project (AOSP) <a
+href="https://code.google.com/p/android/issues/entry?template=Security%20bug%20report">Security
+bug report</a> template, published and pre-published academic research,
 upstream open source project maintainers, notifications from our device
 manufacturer partners, and publicly disclosed issues posted on blogs or social
 media.</p>
@@ -51,13 +52,6 @@
 security issue, please attach it to the bug report and wait for a response
 before uploading the code to AOSP.</p>
 
-<p>If you need to reach the Android security team for a purpose other than
-reporting a vulnerability, please contact <a
-href="mailto:security@android.com">security@android.com</a>. The Android
-security team has a <a
-href="https://developer.android.com/security_at_android_dot_com.txt">PGP
-key</a> if you need to encrypt your message.</p>
-
 <h2 id=triaging_bugs>Triaging bugs</h2>
 
 <p>The first task in handling a security vulnerability is to identify the severity
@@ -245,13 +239,9 @@
 <p>Information for Android application developers: <a
 href="https://developer.android.com">https://developer.android.com</a></p>
 
-<p>The Android security team can be reached at <a
-href="mailto:security@android.com">security@android.com</a>. Our PGP key: <a
-href="https://developer.android.com/security_at_android_dot_com.txt">https://developer.android.com/security_at_android_dot_com.txt</a></p>
-
 <p>Security information exists throughout the Android Open Source and Developer
 sites. Good places to start:<br>
-<a href="http://source.android.com/security/index.html">{@docRoot}security/index.html</a><br>
+<a href="https://source.android.com/security/index.html">https://source.android.com/security/index.html</a><br>
 <a href="https://developer.android.com/training/articles/security-tips.html">https://developer.android.com/training/articles/security-tips.html</a></p>
 
 <p>Community resource for discussion about Android security: <a