[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 8cbc2e9ad1 am: 28eb381cae
am: 05e7acf737 -s ours
am skip reason: change_id I13583455e85c78cfca5f4d67e4b982b58178104e with SHA1 903da3725f is in history

Change-Id: I868f5591b7828da58a24a523af829bc645135cc4