[automerger skipped] Merge "Add the metalava_enabled property" am: 005af5fd am: 1a6ae6c1 -s ours am: 75bd00c0 -s ours Change-Id: Id1c9f09d0f7156c8856c5a79a24b972a46f026ee