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

Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba