[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 7e3ccaa77a am: 1504da0942
am:f3423582fe-s ours am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1bb27866cfbis in history Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
This commit is contained in: