tree e39ec50b706d074b20a8147b8b9189ebb2dca9a6
parent b1e11828098b4cc387ba875cf23d9978aa622676
parent f03247ac4ee880d52ba4537d38ead6addf153fae
author Junyu Lai <junyulai@google.com> 1540533597 -0700
committer android-build-merger <android-build-merger@google.com> 1540533597 -0700

Merge "No-op refactoring of VPN lockdown status check." am: 5c67de8417
am: f03247ac4e

Change-Id: I4e5609af2b23b333908732a1a12cb6e97815edcc