Merge changes from topic "refactor_prov_mode" am: be631ce464 am: a199351947

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

Change-Id: I2ef380353a2559020b9f2502d7dfc921eaa22923