[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 0d9029cf3c am: e38a714d49
am: 38f9eb5020  -s ours

Change-Id: Ia458b3b70217577e3c0368c22bf77eeeb9efe0ed