Merge changes I804a0ba0,I5667cbb4,Ic2c85f3c am: b942012fd7 am: d6fab167b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I820ec3905e3eef4f7fb94c84950f4e4667e5f5b4