Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2df

Change-Id: I520c6df0ed11e24dfbb6e5c394d68e7761d515f2

core/java/android/net/InvalidPacketException.java

@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy;
  * @hide
  */
 @SystemApi
-public class InvalidPacketException extends Exception {
+public final class InvalidPacketException extends Exception {
     private final int mError;
 
     // Must match SocketKeepalive#ERROR_INVALID_IP_ADDRESS.

core/java/android/net/NetworkCapabilities.java

@@ -2000,7 +2000,7 @@ public final class NetworkCapabilities implements Parcelable {
      */
     @SystemApi
     @TestApi
-    public static class Builder {
+    public static final class Builder {
         private final NetworkCapabilities mCaps;
 
         /**