[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 78f8ffbffd am: 2d86f12796 am: 6c0b6a74d0
am: 82fdf2d8b6  -s ours

Change-Id: I5376c6c52ad02326cd9bd797b72ce372d0837f03