Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868 am: 4395176792
am: 7779d9ee91

Change-Id: I7d7b4c181ba94d662f4d1946513fdaf6bdb6e9dd