[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c am: 582d18c0 am: 9f0aff0d am: 767ce85d -s ours Change-Id: I2bd03ffeae08807e853b1196b076aab9a2312bf6