[automerger skipped] Merge "Add the metalava_enabled property" am: 69251fca46
am: 83a2bc6a3b  -s ours

Change-Id: Idacefac9a3991453f635b3bd2af554bf96e4e821