Merge "Try OPNS/OLAC before PPTP/L2TP"
am: 7ea34f7213

Change-Id: I598c09dbb46146c07e1703b0fccf85ed21b31ecb