Merge "allow otasp activation for system user only"
am: 0d3a5d78cf

Change-Id: I203db5d9499d95d763c6f69f806607bbea47d078