[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3b89584a7e am: dc5ad0b6e6 am: 412a19d69c
am: 84dbd83f6b  -s ours

Change-Id: If70deb58ef8a7e8b676963a4c3df5314a73a0307