Follow-up CL to the change at aosp/1495896 am: ec5fd18c57 am: 51c14f03ef am: 62ff457c42

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief3bdc2fe262bf0d70801331f18cec4320de0501