[automerger skipped] Try OPNS/OLAC before PPTP/L2TP
am: a378c558d6 -s ours
am skip reason: change_id Ic64426c76135b717a1da7013bc03501c03d19a6b with SHA1 d799900e7b is in history

Change-Id: Iff378e03bc77456d848c051c92db0c8346ca30be