Merge "Include annotations in module metalava runs" into rvc-dev am: b0033693a8

Change-Id: Ibb47b41b065f59f372e17be002c265087ffa2347