[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: c674b05757 am: 1dbb9a95cf am: 07a3f0fe8d -s ours
am skip reason: Change-Id I8ffa1da1bcd43c25f4ff817575db77a33c0f3d31 with SHA-1 00f8b53650 is in history

Change-Id: I21381e49aa1b4dcf10c37a72552ca35ea95a61d6