Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976 am: 13d51cd39a  -s ours"