Merge "Added new VehicleAreConfig.aidl fields to ProtoMessageConverter" into main