Merge "Update apex_available field" am: 94655a9ced am: 8803ad7786

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

Change-Id: Ib1d18dc95f7fdaf048ea95ddcee0d03032567e65