Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976 am: 13d51cd39a -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
59fb3997b7