tree ee0f777c57ec324bb9e33654df238f0845613412
parent 5925057673043828b75663b6158dcdb8d77a8ae2
parent f6253ef4350a8d0f722b54411da48b9489666b14
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576757612 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576757612 +0000

Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435

Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a