[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 9513a9e215 am: 5e2a54ab19
am: 4ef06935d8  -s ours

Change-Id: I7a47b03dd5fa8a602e3da1a5b41c09c16dc4e247