Merge "Backport system default callback to Q" am: b616c88748

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1760686

Change-Id: I096ef2def0a5c627ca9f1c8528d67dd7591628fe