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

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;

     * input by InputMethodManagerService.

     * @hide

     */

    @TestApi

    @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS)

    public void setVrInputMethod(ComponentName componentName) {

        try {