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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib86109cc1d839ec72bab278918d5ab5e59f91567