Remove UnsupportedAppUsage, use correct State* classes
am: cdfc9f3809

Change-Id: I0ee1a1c6902c340c778b7e2423d5b71efab0de8e