Android Mainline 12.0.0 Release 49 (7914710,com.google.android.networkstack)
Merge remote-tracking branch 'aosp/upstream-main' into master am: 072dce8ca5 am: bcf1f249f1 am: eebbf2e2b4 am: 94205e0ca5

Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1673705

Change-Id: I164082a11bcb60d7c406b7f75aa3f190b58a1342