Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: fabe5787f0 am: 17c2040532 am: 78c744d29e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I8b109e26a043478b9058dbb058b65778259c496d