[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 792fb35cee am: 8f2e5344be
am: 00ae427a7e  -s ours

Change-Id: I66a607d3c035a1b4233f1561c06fad7e03899945