[automerger skipped] Remove UnsupportedAppUsage, use correct State* classes am: cdfc9f3809 am: f25a0bf1b5
am: 84dc8b957c -s ours
am skip reason: change_id Id620c4c7c4c74cf304def7cb5779285762760035 with SHA1 ac12bae569 is in history

Change-Id: I27c916e6aa7bb3c6ef68bc1ac0e3695568afd29b