Merge "Remove unused UnsupportedAppUsage annotations." am: c5dd215f8a

Change-Id: I6b8e9c16a8b41b376c074e12e062d3ca0c2fe00a