Merge "Add VpnManager.TYPE_VPN_OEM_* constants for OEM use." into main

Parents: 28e63e5 , 26b2fd3

Committed by Gerrit Code Review <noreply-gerritcodereview@google.com> on 3/18/2025, 7:50:13 AM