Merge "Remove unused UnsupportedAppUsage annotations." am: c5dd215f8a am: 01d352ca7d

Change-Id: I4b95dc44078fd82650ee77478e198d6b876c147c