tree cce0f51c5eec683946318f54b5f2b5d509bc2e77
parent d4313a6d0f2b797ceec8d69c7121a19ec9c0b5bc
parent 01bec3bb2b49a6e5754214a70e0c5384527e392b
author Paul Hu <paulhu@google.com> 1604565479 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604565479 +0000

Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I16d87836136f411e61756246817ed448d974bec4