Merge "Add ro.vendor.build.dont_use_vabc to property_contexts"