Merge changes from topic "presubmit-am-6a703b2542a2488da257f2abf8b1e346" into sc-qpr1-dev am: ab698db291

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

Change-Id: Ife475b0c43c51bb8670dc73b57198a0da6d82128