Merge "Add the metalava_enabled property" into pi-dev-plus-aosp