Merge "Expose getPreferKeepClearForFocusDelay as TestApi" into tm-dev

core/api/test-current.txt

@@ -2878,6 +2878,7 @@ package android.view {
     method public static int getHoverTooltipHideTimeout();
     method public static int getHoverTooltipShowTimeout();
     method public static int getLongPressTooltipHideTimeout();
+    method public int getPreferKeepClearForFocusDelay();
   }
 
   public class ViewDebug {

core/java/android/view/ViewConfiguration.java

@@ -1104,6 +1104,7 @@ public class ViewConfiguration {
      *         clear, or -1 if Views should not set themselves as preferred to keep clear.
      * @hide
      */
+    @TestApi
     public int getPreferKeepClearForFocusDelay() {
         return mPreferKeepClearForFocusDelay;
     }