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