[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: df82ab2de2 am: b6c87140c7
am: aa3a71bd85  -s ours

Change-Id: Iccef3823952f01df1ccc9b718f60f446aa8eb8e0