[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50 am: 582d18c02b am: 9f0aff0d98
am: 767ce85da6  -s ours

Change-Id: I2bd03ffeae08807e853b1196b076aab9a2312bf6