[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 39f329c52a am: 62169a75cc am: bd4e71148a -s ours
am skip reason: Change-Id I5be7335b23a92b8ac80d2fd890198273b66ad644 with SHA-1 ad9254cb1d is in history

Change-Id: Ib92174f4eadd11128c3f25a49801de965e2f4f0e