[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 14dea1f70c am: 2603ad7576 am: abe219f635
am: 9d36e09163  -s ours

Change-Id: I31a2757c8aa0e30e885a60e506eac818ef19f6df