tree f9ff60d2f1aac30f3456707de185ff596705ecc6
parent 9d881ec1ce4f51ed3ff7e80e4e9536ecd2274ff0
parent 6eacfb6b733e1d4dee3db3438f81c42d944d88f8
author Mark Chien <markchien@google.com> 1602497006 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1602497006 +0000

Merge changes I60ed5465,I70b49d0a into mainline-prod

* changes:
  Make the IP subnet persistent till reboot
  Make PrivateAddressCoordinator ignore vpn network