[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f304f4d2ea am: 734611e34e
am: 0c09cf5011 -s ours
am skip reason: change_id Iefe25091fa0fcc0adfe4ff85fe5e3ab3ac9c5f10 with SHA1 f4fb6fb754 is in history

Change-Id: Icc50da0687097463a22dd7f982ca743372121185