[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: eabac25941 am: af43472016 am: 7df18b14dd
am: bbdf33ccd4  -s ours

Change-Id: I7f1320133b2937097e3597959e4cf9dee733df7d