Merge changes from topic "sdk_int_cp"

* changes:
  Fix testSocketKeepaliveLimitTelephony on R
  Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity

service/src/com/android/server/connectivity/PermissionMonitor.java

@@ -153,7 +153,7 @@ public class PermissionMonitor {
          * Get device first sdk version.
          */
         public int getDeviceFirstSdkInt() {
-            return Build.VERSION.FIRST_SDK_INT;
+            return Build.VERSION.DEVICE_INITIAL_SDK_INT;
         }
 
         /**