[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d08509363c am: 62a722476a
am: b7e87b4ad5  -s ours

Change-Id: I9e06fc4bfabad995970d93b3ed281bd688f795a6