Merge "Revert "Use new UnsupportedAppUsage annotation.""
am: edf7ce4f38

Change-Id: I67d7d5a29882c7e8f935ddbc24b5d544bd57be9e