Merge "Move blacklisted methods back to greylist" into qt-dev

am: 71a267b66f

Change-Id: If6ece59a9d19510fecf41cd101644697fa22bdd6

core/java/android/app/AppOpsManager.java

@@ -2405,6 +2405,7 @@ public class AppOpsManager {
         /**
          * @hide
          */
+        @UnsupportedAppUsage
         public long getRejectTime() {
             return getLastRejectTime(OP_FLAGS_ALL);
         }

telephony/java/android/telephony/CellSignalStrengthWcdma.java

@@ -18,6 +18,7 @@ package android.telephony;
 
 import android.annotation.IntRange;
 import android.annotation.StringDef;
+import android.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.PersistableBundle;
@@ -70,6 +71,8 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements
     private static final String DEFAULT_LEVEL_CALCULATION_METHOD = LEVEL_CALCULATION_METHOD_RSSI;
 
     private int mRssi; // in dBm [-113, 51] or CellInfo.UNAVAILABLE if unknown
+
+    @UnsupportedAppUsage
     private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 or
                                // CellInfo.UNAVAILABLE if unknown
     private int mRscp; // in dBm [-120, -24]