Merge "Remove unused UnsupportedAppUsage annotations." am: b5aa84b6cc

Change-Id: I803fd13edd7429a6d16bb93831181e7f453912cf