Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge