tree 05292b26c582a4160ebbb9d95f4a8ba582ae7623
parent ceb1e912b3ec46c8a6d39e8403e3be6c7fd71440
parent 8ac636ef82256bbc8f212a4bf40a993f567ea7e7
author Junyu Lai <junyulai@google.com> 1610527450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610527450 +0000

Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2 am: 8ac636ef82

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I782f688fc0cfa8d211b1c9cabaebf22ca19c8791