Merge "Disable checking AVB in runtime vintf"