[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 57a0beab18 am: 2eff83dcb3 am: 859b6345c3 -s ours
am skip reason: Change-Id I4bc8c9482e4bb1af21363f951affff7ee3fefeab with SHA-1 53fe96661b is in history

Change-Id: Ib574b70cca987499993f9e5fbe1e406e80524899