[automerger skipped] Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa am: 59318bab67
am: 79aff5c601 -s ours
am skip reason: change_id Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6 with SHA1 f0b7d0ba51 is in history

Change-Id: I1e9b0579e65071e042c4595083427bcc7889c15e