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