am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from...
am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '46dbb5be':
Do not enforce CONTROL_VPN for calls from lockdown VPN.