[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3b358c7c am: 79a76542 am: a20f0f5d am: aa0b18ab -s ours Change-Id: I185807dc7bc885076201542fde5ff1aa75e681b7