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

Change-Id: Id1c9f09d0f7156c8856c5a79a24b972a46f026ee