[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5 am: 5d01988bcf
am: 1c701f1427 -s ours
am skip reason: change_id I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25 with SHA1 4b2116ca79 is in history

Change-Id: I445eeb957aa451214f175a634252655978be0033