[automerger skipped] Merge "Add the metalava_enabled property" am: 005af5fd72
am: 1a6ae6c137  -s ours

Change-Id: I058a19babc89a2015a90e022b76dd927f12bad58