tree 5116604d4b0e995537cee174d9174a650307691a
parent 82a02d946a4bf7da11dc0c6be3c4b0b2d52bd378
parent a378c558d64867008f4344490e3df4706e965fa7
author Alistair Strachan <astrachan@google.com> 1559112507 -0700
committer android-build-merger <android-build-merger@google.com> 1559112507 -0700

Try OPNS/OLAC before PPTP/L2TP
am: a378c558d6

Change-Id: I6424dfadcd77874edd1095066b1ec612b32eeea1