Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)"

am: a48e431113

Change-Id: I4f5284ab3445e89a2394386ca0da6ae8cf613906

core/java/android/app/VrManager.java

@@ -4,7 +4,6 @@ import android.annotation.NonNull;
 import android.annotation.RequiresPermission;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
-import android.annotation.TestApi;
 import android.annotation.UnsupportedAppUsage;
 import android.content.ComponentName;
 import android.content.Context;
@@ -230,7 +229,6 @@ public class VrManager {
      * input by InputMethodManagerService.
      * @hide
      */
-    @TestApi
     @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS)
     public void setVrInputMethod(ComponentName componentName) {
         try {