Merge "Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 30c63961dd" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
71363f6c78