Android Mainline Module Release 8848683,com.google.android.captiveportallogin,com.google.android.networkstack
Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1 am: a1ded2684a am: f8d46ecb0e am: b4a03abdd9

Change-Id: Idb62673139a8084dfd6d0b8e7973fed31f804cee