[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb am: a166b4c136 -s ours
am skip reason: Change-Id I853372f3c6fef905553bb31be4f1bb48df735f7a with SHA-1 2ebb31c00c is in history

Change-Id: I4f3d8a5ed1c490a78408af4e196b054f72c397d0