tree 9b4b72c8e0091f8a66322f57e30b6fb787deca1b
parent fe39a927b58ea563f567f94bd252fd490024df5f
parent e88250ddfabec58fd19696e94ff725fc91635782
author Treehugger Robot <treehugger-gerrit@google.com> 1610110922 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610110922 +0000

Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043 am: e88250ddfa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d1357ca43af78e20ce09ce8fbb727cdcd9a5bad