Merge "[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev am: 9654ecebd7  -s ours am: d1b4a496ec  -s ours"