Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
Merge remote-tracking branch 'toybox/master' into update am: fd67c867d2 am: 9ca15f063b am: b6ece7f09c am: 99dd3dcebe

Original change: undetermined

Change-Id: I17233d316206e42988c04b4dd2883807ab68068f