[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d717c04b12 am: 629a3828e2
am: 6b269a7e26  -s ours

Change-Id: Ic0cc520e264f50d8425af1a026e109a96d5cd534