Merge changes from topic "presubmit-am-0570772c8ea242f5b67125f81fe66fee" into sc-qpr1-dev am: 9eb4ab0ae7

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

Change-Id: I9fa42227a0647e41320fccdddbfb0a99928e0c55