am: 4920698e17 * commit '4920698e17dc8aacd1b0743d313383a8ee1a3400': Make some of the UID-based VPN code reusable Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
am: 4920698e17 * commit '4920698e17dc8aacd1b0743d313383a8ee1a3400': Make some of the UID-based VPN code reusable Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c