Merge changes from topic "150578172-ns" into sc-dev am: d09bf3623d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd3efec3f891d1afe9bc0f658d41616515d838e7