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

Change-Id: I7513067846f13da2189a46f270a3a4ca0dbe0504