[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 09426de69d am: 4bd5774611
am: abea8411b5 -s ours
am skip reason: change_id I4ece0a3f37f88fc2508cb965092aed7cabc61819 with SHA1 24ec321bf3 is in history

Change-Id: I8d48fe483febc5983e59b098c67e8f778f461d4d