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

Change-Id: I3cbddc6d5127ccbdfeab0c5941a7f27fcfc4b648