[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 10c573ff85 am: f63b6157a1
am: 4a4717bcee -s ours
am skip reason: change_id I570c08292f8a9f512c96f9dce13f5337718f112c with SHA1 da6e570f1e is in history

Change-Id: I6eeb129848fb396edf461c9a70b70974e166afcf