[automerger skipped] Merge "Don't pass annotation srcs to metalava for...
[automerger skipped] Merge "Don't pass annotation srcs to metalava for modules" am: 784474bb am: 5ebda667 -s ours am: e93e631e -s ours
am skip reason: Change-Id Ibb044c099174ee8591e14b6e2c683a46c1a756ef with SHA-1 3b9ac0cb is in history
Change-Id: I2270ab9c4f093f4e755063bf2ee1a70df43fc764