Merge "Add trackingBug to API used by chromium vebview." am: c25ad64386 am: 53507c3423

am: 737a7a0e4f

Change-Id: I20f16a26e566eaf55d11be09b8050e0185cf8f81

core/java/android/content/Context.java

@@ -3067,7 +3067,7 @@ public abstract class Context {
      * @hide
      */
     @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS)
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(trackingBug = 136728678)
     public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags,
             Handler handler, UserHandle user) {
         throw new RuntimeException("Not implemented. Must override in a subclass.");